location: Make _connectToGeoclue() reentrent

https://bugzilla.gnome.org/show_bug.cgi?id=723684

diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index bc42a4e1d4d65835c7d1f2811162003e1a90d29c..b14bd8abb079bdb191af3e231b41df94db9d7c3d 100644 (file)
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -41,13 +41,19 @@ const Indicator = new Lang.Class({
     },
 
     _connectToGeoclue: function() {
+        if (this._proxy != null || this._connecting)
+            return false;
+
+        this._connecting = true;
         new GeoclueManager(Gio.DBus.system,
                            'org.freedesktop.GeoClue2',
                            '/org/freedesktop/GeoClue2/Manager',
                            Lang.bind(this, this._onProxyReady));
+        return true;
     },
 
     _onProxyReady: function (proxy, error) {
+        this._connecting = false;
         if (error != null) {
             log (error.message);
             return;